Fixed termination and added EXIT CMD