Relatively strategic Bugfixes and improvements.