2 d riemann

Fixes for most obvious problems