More things edited :)