Updates on final work
Merge branch 'Final-Touches'