Attempts to fix more problems.
Many updates, bugfixes, 2D stuff deleted.