Add Shield for servants and remove bugs
merge