additions; fixes