V 2.6

Lots of logic changes and fixes