More CLI changes, update readme