Changed a thing or two, fixed shit