many small style changes