added fixes
added fixes