New stuff and fixes