Misc. Updates

Still a few final tweaks to make