fixes

that's the most important