Misc changes + N-O update + reverted the "fix" for ten

I can't math....