small improvements to last commits