Lots of tweaks and bug fixes, mainly for the Dekstop Application. Will merge these back into master shortly.