Fix points display, make TRACE global and use it more