Bugfixes; implemented some unimplemented methods