Added haddocks; eval reports token count; resolved compile warnings