still fixing js issues