More GUI and other Code Changes