#159 small improvements