Updated two problems, re: swapping variables.