style-bugs fixed