Some little modifications, prompt and more logs