Fixed it a bit after a few months, thought I'd post again cause I think this turned out better.