Update: Some small adjustments