Misc fixes

Running tests with gulp. Should lead to simplicity... maybe?