some fixes done