collection of fixes, cleanup and others..

some fixes, indentation cleaning, elk spelling, html5 improvements etc..