Fixes, more comments, variations