Stamp — a few tweaks

by Jesse Bauer