lots of little fixes. mostly zon and frm