2.5.1

Bug fixes and improvements.