Fixing and adding some code instructions