Removed some that now work correctly, removed others