fixed hell of a lot of shit