Some additional changes

:)