Fixed some js n stuff, still experimenting