add missing methods, add missing attributes, cleanup function names