rebase master, test and little fixes