Costumenaut: Update Dec. 17th, 2017

Some minor optimization-related fixes.