Adding panic, and final tweaks before 1.2.1