lot of fixes..