A bunch of code cleanup mostly
A bunch of updates to the JS layer