Cleanups - fixes #1, fixed #4, fixes #7, fixes #8