fixed issue with project numbers and more