FIX: Fix command-line tool, add placeholder for tutorial