many fixes to scottfree !