A few changes

..