some fixes done here