new addons to clustering module and some further modifications and changes