small optical improvements