Paper prep

consolidating work for initial publication version