made fixes to close
additonal fixes