Small updates
Fix merge
Delete gtkglextmm