Code clean-up. Adding assorted messages and re-directs, cleaning up variables and comments.