Fixes in parsing + now parses general information