quite a few style bug fixes