[07/14/2018] Revision Update & Bugfixes