Removed extra comma, quit bug and recompile

Most of the changed stuff is due to optimizing helpers in compile step