updated a few files, see diff