2 spaces for js!.. and misc updates