Improve inns and fix some bugs

* Fix #306
* Fix #305
* Fix #301

This won't merge easily with #309 :/