hammerhead: add some goodies and cleanup