various bug fixes
yoda fixing conflicts;