Doing stuff... JS makes no sense....
Fixing minor conflicts....