minor fixes, am thinking I can run the entire project within a couple of hours now