v26

No due date 87% complete

fixes/features to be done for v26