Various changes

A few changes, some commenting.