fixed stuff hopefully