Buxfixes and improvements.