some modifications in style and fixes