new styles, bug fixes