fixed stuff here and there