Continued work fiddling with comments