Tare Prompt merge fixes and a Multiply (*) key bug fix

When I pushed the tare prompt code last time there were some merge issues. I think I Have them all sorted out in this request.

I also have a bug fix that was causing the multiply key not to work.