Cleaned up the output & bug fixes

Fixed false negative for  container deployments