Cleaned up commenting; removed few debug traces; now moving on to testing Mac