changed a LOT of things