dropped underscore dependency, various small improvements