update multiple cursor support
Clean up built in components