More tweaks
grrr