Fixed CLI option and added comments