Some clean up, bug fixes, the whole deal