small fixes v1.01