hopefully final tweaks