Minor fixes; fixed argument validation in hawk tool