Misc fixes, rebasing, and front end using swing work