tidy up and many fixes

tidy up. many title fixes and elements