a few more and a few fixes