fixed a few more things from the weird reduplication issue