added angular scoping, clip target and collision target differentiation and some related fixes