adjusted a bunch of stupid font shit
merge commit