minor changes as working begins on hosting-farm