styles and small fixes