Various comments and changes from my framework