Fixed things & stuff