Tweaks to code
tweaks