some fixes and changes to 621e.js