Added a bunch of polish