implemented most missing methods, removed stubs, other stuff