made a few more changes bc im indecisive...