More comments, fix hack that made state lists work