Implement all of Mont's comments.