more fixes done