minor changes, all around