Roland's Update 2 - fixes #888, fixes #887, fixes #886, fixes #885, fixes #884, fixes #883, fixes #882, fixes #881, fixes #880, fixes #879, fixes #878, fixes #877, fixes #876, fixes #875, fixes #874, fixes #873, fixes #872