#169 minor changes