lots of changes. primarily the paper