fixing some minor issues