Scanner

Handle more (remaining?) scanning edge cases, print better (properly formatted) error messages.