small improvements here and there