added fixes
merging conflicts