Follow up on review
Current work in progress, some improvements, and some bug(s) remain