many small changes; pushed in addons from test projects