Added new options, fixed formatting