Fixed several parts with Luca's comments