Pull in all of Alex' work plus final fixes from debug today