Final

Some finetuning and comments