Added prompts and small bug fixes.

Added some verification prompts and fixed a few bugs.