strange
small improvements