Small Updates

Just a few small tweaks