Even better bookmark id creation/lookup. Also removing extraneous puts