some fixes in final edits