simplifies a big chunk of the codebase
makes syntax a bit more consistent throughout project
cleans up manipulator.js
last tweaks