Minor changes
Bringing things up to date