various fixes
fixing conflicts