Included quattor check function. Some minor fixes.