merged with plugin, minor coupling fixes, more incoming...