Better format for lists and added q option