Options and comments

Added default options and some additional comments.