changed: killed a bunch of warnings (yes, vs sees them too :)