A lot of fixes, see the change log