Added square TBC, fixed display bugs