radical formatting/indent fixes
Lots of changes
more fixes of nasty bugs
Minor code cleanup and some frontend mods