Add 2 more tools and update some android functions