Files Updated

Updated many files, standard cleanup