added some fixes to webtool