Beta 3.1.1

- Not released
- Add preferences
- Two new TODOs