fixed parser (ongoing...)