more small improvemets