Fix baseline implementation, improve end-user feedback