Made Container act more proper. Cleaned up others.