Nasty bug in zrem and lots of tweaks in conjuction with Kirigami