Updating scripts and applying more system checks