2-0-0rc3 (Several bugfixes and improvements)