Updated Header file + other changes§

Fnal version for Sam Tuesday 17th