added chalana, few fixes