Improvements to time measuring. Fixed (not) negated strcmp. Minor changes