fix missed switch pointed out in review plus a few others