draw control & modify feature bugfix;