fixed a few ebkac