Massive code cleanup. Verbose messages all figured out.