bug fixiing fixes fixed maaaaan