Fixed some spelling mistakes
Fixed some display bugs