few fixes on the registry and setup
6 files changed