Bugfixing, changes, testing.