(they both were temporary data structures and there was
no real reason for them to be there, especially in view
of a possible code parallelization)
- converted most uint64_t to unsigned int since they weren't
really necessary
- fixed a couple of compilation warnings
076831aa31