fixes - now CLI is working correctly