Fixed some JS stuff and comments