Final delivery

All issues fixed.