Found some new errors, made excel generator better behaved