Improved control flows, and added set().