Cleanup misfunctions + append a better OR system