Project housekeeping and minor updates to modules