Some stuff and code cleanup. Wow, very descriptive.