milestone bugfixes, project partial