Made a couple finishing touches