minor updates based on review comments
resolving conflicts + minor fixes