further improvements
minor fixes