more scanner work
get things compiling again