improve YCM handling and other things