updated to 1.6.1 and some more work.