Some bug fixing and removed the ask before exiting feature.