#169 small changes