Phase1 bugfixing

2 bugs found in phase1

* wrong row tracking
* did not account for non_zero == 1

After looking at that code again, I think it needs a
small rewrite, some things could be a bit more efficient...

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>