Various improvements; completed challenge questions.