Improvement help-dialog & Fixed code review comments