Cleaned up the code a little bit, fixed some confirmation messages on
exit.