few cosmetic fixes, bump version to 4.0.0