updated underscore
tweaked headers
added mapping functions