More trimming and fixing.