fix the things @flv92 found