js and bug fixes