added several checks, espeically metrics checks