main update with several bugfixes everywhere, not stable