[FEATURE] - Prompt - fixes