fix camel casing of some methods
various cleanups