[MOD] Fixed errors and changes