+ fix various rendering problems