Some usability changes. Added another question.