Test the rest
Further updates (including updateWith bugfix)