updated porcelain, command line wrapping