Black screen fix & other half-finished additions

Ta-dah!