Adding panic and tweaks before 1.2.1