Proper fix

Also cleans up some other bad coding
do not tidy unless needed
Merge remote-tracking branch 'origin/master' into fixing-quotes
proper news on index