Unified naming stuff, turned on optimizations for now. removed length overloaded functions