a few tweaks
hopefully the last changes for a while