Addressed #35, also fixed some logical properties. Attached interdiff for same.