more rework & fixes