fixed fixes that needed fixing