first part completed
bug fixed
saving changes