fixed stuff. oyes