merged and added fixes