many small improvements/bugfixes
fixed small typo