final simplex fixes, ready for usage