Bugfix and refine