fixing some leftovers and mistakes