fixing issues with parsing and docs