added Kadira, fixed part of Billy issues