Logic, Bug Fixes, GUI Touchup