fixups and weeding