Improved treatment of submanifolds