Fixing some bugs, cleaning code, and improving the user experience. Closes #1