pretty much fixed some issues with js1