Minor changes, fixed output when no ouput option specified