removed some debug code. updates #22