more finalizing edits