Small updates to help tie in the setup. Any suggestions for how I could improve it?