hammerhead: fixes and cleanup for thinkingbridge