bugfix
minor changes