few fixes, but still unstable.