Small updates on script