Changes :
Added code to fix various issues raised on server