Fixed errors so collision 'mostly' works now