preparing for merge to master, lots of edits