Touch ups. Still incomplete.