better graphics overall, optimizations

Change-Id: I5ff17fee42c68c60f6e0ae3a1b6a4d87282c30c8