add small fixes from first tries