Tweaks and updates based on michaels comments