Updated headers; adding new tools