reordering of some code; change Get to not do so many allocations