changes to flow of hinting/feedback mostly in place