Added new options and help feature