Better cli and fixed --workspace