small improvements #12