Improved hidden city machete warning

Fixes #101