added more structure and corrections - Valerio.