fixes on my way to a library version