Bugfixes and stuff.