added fixes
a