Correct js errors and update from fork