Lot of clean up, and WIP: IV and EFLC too (like last comit)