fixed stuff i messed up