improvement and fixes

1.13