some more updates and edits before posting