Addressed a couple of minor issues. Major actually, since they prevented the code from doing what I expect.