a few more polishing things