better parsing, some testing done