Random changes. More work on the Scanner.