style & interface fixes