Fine-tuning
minor fixes