better YCM handling; misc other stuff