Fixed bugs, Add Angular tools