Msvc 2013 changes

Some things pointed out by the MSVC code analysis I was playing around with.
Mostly just trying to make sensible changes too a few things, remove redundant overloads and get rid of some rubbish code etc.