SOme small changes and fixes