Fixed packaging and a minor nit about the stdout option