lot of changes
lot of fixes