added several feature request to plan