Updated numerous methods in the underscore file