Finally fixed a lot of things, and gave up on others..