Added viewport and more comments