some improvements. Little effect added, but is not complete yet.