Lots of updates to better manage the project