never happy with the layout. Also added some X related stuff.