fixing some uncommitted stuff