Changed a few things and added -h and -v