Changed defaults

Change defaults and add code comments.