ADDED: minor fixes