added a little more and did small reorgs