[marshall_110]

Thanks whpalmer4 for the reply! This update resolves these 2 major issues for me.