minor improvements / bugfix