slight fixes from refactoring, runs blue screen again (the good kind of blue screen)