merge + minor fixes