Cleanup

Minor bug fixes, added copy here and there, minor aesthetics