Found more bug in .js files... fixed.