error management updated
updates
almost done