- fixed build with "x" man suffixes
- cleanup