N, Z, and some bugs removed
Some renamings