javascript fixes
Final!