Tied up some loose ends

There was still some code I had to change. Now it should be easier to
start the project up.