small fixes, style and cosmetics.