Some bugfixes and improvements on announcing