Many updates in main project scripts