Made a number of changes to improve the installation of the cythonised components.