Did most of the fixes suggested by Oren