misc updates
resolving version conflicts