finished up with js stuff