FilterTool2, minor asthetic and comment changes.