Minor updates

Some internal optimizations and optical corrections where check in.