bugs correction style improvements