Small tweaks
Fixes for scanner and started on command processing