bugfix
minor improvements