Some more changes

Hey Jordan,

I've made some more enhancements and wanted to share.