other style changes

- and fixed some "bugs"