added borders and then removed them, tweaked other shiz