slight tweaks across various examples