small improvements, bugfix