Smaller optical improvments