added some candidate fixes
some more candidate fixes