Final changes recognition
Corrected some bugs