some modifications
fix issues and continue the cli