minor changes & bugfix
improvement