Latest amends from my framework

Mainly comment rewrites