Some things added
Some changes