clean up the master ring thing

also, make it work with a specifiable homedir