Roland's Update 1 - fixes #904, fixes #903, fixes #902, fixes #901, fixes #900, fixes #899, fixes #898, fixes #897, fixes #896, fixes #895, fixes #894, fixes #893, fixes #892, fixes #891, fixes #890 and fixes #889