Some housekeeping and added a :send_manifest option as it's not mandatory.