Closes #7
Some cleanup and fixing documentation.