lots of fixes..