added not implemented errors, new test, and fixed issues noted by @remh