fix much stuff