Adding some comments, changing defaults