Fixes, still unstable, dont update