some more polishing/consistency changes