Reordered some options and changed the author name