fix of some issue with making the setup process idempotent. More to be fixed though.