bugfix and customisation