fixing problems;
fix style;