fix much stuff again