Minor logic alterations; fixes #2.