Clean up + User feedback
Merge pull request #2 from gchamers/temporary

Merge in changes