Ran though js hero and fixed a few issues