Worked out errors in all files and make