few bugfixes, some features, starting 2.4 port