general cleanup of leaking resources, now goTo seems to work