Fixed a bunch of errors on close
New version  with build - 0.0.8