More fixes and save end result