Minor fixes and improved tools section