4/25/2013 - v2: more requested tweaks completed