made a few small changes, might add more over time