Uploading last changes, almos finish xD