Various updates to the project