More command-line and fixes.