Fixed deadlock when high modes overtake. Also fixed bug with o.prepared and used macros more consistent.