v.003: small fixes