Add smaller features for screen creation
Allow single objects to be used as targets