updates from whitewhale; some spacegrant updates