some mods/fixes/un-comments that get things going a bit smoother.