fix headers only with exchange
further stability and speed improvements
remove strong naming