bug fixing and new features added - preparation to 2.4 or 2.3.2 - to decide