Debugged a little and did some js stuff