solved scanner/parser issues