Some additional changes

a long way to go!