Fix #13. Fix #12. Fix other stuff.