Fixes remaining issues

Now works