cleanup, begun implementing implicit locale use