Fixed some complications within the files