repaired lost data and merged. small fixes