small optical bug fixes