Added more options and better help.