fixed stuff again