ADDED: small fixes