Fixed numerous comparison errors

- Fixes #74
- Fixes #75
- Fixes #75