Added -h and -v along with some slight alterations