Fixed tests, and prompting for input. Added some minor error handling.
PODs for the dist.