2014-12-03 -- PC Merging issues

Fixed some issues between the mac and pc versions.