Fixes issue with boilerplate, improves CLI, ads config option