Bugfixing + added missing JS libraries