Fixed more loading bugs and added more stubs.