Tried fixing some more crap