working on fixes m8s