Loads of small changes. Gonna clean up the code next time...
Adding busterjs