some changes

fixed the build so it runs again, graphs don't work yet