Fixed some header texts
Fixed variable Naming conventions, fixed some structure code.