Minor updates
Some changes