fixes and cosmetics