Intermediate Step - Tiny fixes

JS evaluation. It's still a work in progress