small improvements added