Updated & fixed for common standards.

See commits for in depth details.