Updated various files