small fixups, TODO comments