[UNSTABLE] Some Fixes... still not working