fixed a variety of errors identified by maruku