few fixes done