fix rendering bugs etc.