finally fixed the longly broken trunk. Also started some testing