commting bug fixes
merging conflicts