BUG FIXES, AND CHANGE OF STYLE