Added kill and quit + minor changes