Time to blame something new (#BLAMETHESPLITSCREEN)

also, fix some minor things

Change-Id: Iade50e954a1d8af62c2a46c5e822acffd37abd3b