lot of modification and resolution of bugs
Renaming & updating forgotten things