more and fixes