Bugfixes and file path fix for JS