Lots of changes working much better now.