Feature/bill/candidate fixes