SP1 (lots of fixes)