Sanity check improved... -h flag still needs some fixes