some bug fixes on style