#223 minor changes