Edited lots of files so as to compile