many small fixes, test2 from web Compositer is ported and runned with some bugs