Stash data in object, other cleanups and fixes.