done with the last fixes, feature branch ready.