Minor changes. Relocate some variables and change minor messages.

More to come. We have to clean up the code here. It's a mess.