Added more defaults and comments