fix pretty stupid stuff