Found and fixed what should be the terrible bug, should be perfect now