More defaults and doc block corrections.