small improvements here and there
small improvements