Fixed all files, ready to continue...