changed defaults and removed some unnecessary comments.