1606 More tweaks