Latest build with nearly all amends but needs xbrowser