Removed TODO from git repo
Minor cleanup
Fixed a few issues with signal/slot connections