a lot of fixes done