fixed stuff i think