Auto update tool and some general fixes