updateTimestamp and cosmetic fixes