Minor inner improvements