FAIMS-311: updating tools with better error messages + make few performance improvements