Release/2.6

Bug fixes, and stability improvements.