bunch of changes from the rutger install