Cleaning up

Just a note that I'll be spending most of the day upgrading the site so posting will be a little slow.