various fixups and cosmethic changes