final debugging edits