Small tweaks

Made a few small tweaks