brant's updates/fixes