Update for -o flag and general comments.