small style changes and fixes