Fixing errors, some still exisx