More Cleanup and GUI Work