More updates to analysis scripts