Further improvements concerning the update function
Report file is also updated now
Slight refactoring and clean ups