cleaned up some display bugs