First Demo! Whitespace, miscellaneous fixes