First round of tweaks

Played around with it today. All seems to be working as intended!

Just need initial blog post and I think ship it!