Added small tool to check for missing options
Added MECHANISM option

- some other cleanups