Handle hoppers, fix 'line' command