More improvement and fixes