Cleaned up code and comments, changed todo comments to issues, formated code. Closes #7. Closes #8.