IE8/9 Fixes, general tidy up