Bugfixes. Building the testing infastructure and quashing them.