Better comments and more GTK cleanup