Some minor fixes and an amenity grist rework.