Some random changes here and there I guess