Better Checks

Reduced warnings and errors.
Need to incorporate proper output logs not "echo"