Some miscellaneous cleanup

Still only getting a black screen.