mostly mcollective stuff and some bug fixing