* #16: small fixes