Fixed several issues according to feedback.