Small GUI update, Bug fixes, syntax unification, comments, cleaned up some places