Added Kalabra and other minor changes