excellent feedback is excellent. Port over baroquebobcat's fixes