Various changes/tweaks to code - Sean 12:03 10/5/14