Revert "fixed some parsing and display issues"

This reverts commit ab0ae9a2c1a3e09943aaf57363490afdbe600d80.
fixed some parsing and display issues