moar
shtuf
more fixes
done?