More styling clean ups and corrections to several of the class libraries. Code compacting in progress, stop copying things around and make things tighter and nicer.