Initial bugfixes

[minaremeli]

I think with the successful run of the basic experiments and the visualizations we have rooted out most of the bugs.

In my opinion this branch is ready to merge.