Debugging commit

Tracking bug in coriolis interface: many assertions added and reviewed
+ code cleanup on the fly