CS/Typo fixes
Fixed typo and display bugs