CLI: Make and Documentation bugfixes