Many updates to various files