Tweaks by Dave 'ChainMan' Cheney himself :)