changed some js and stuff