Fixed bugs and integrated new Tricks