fixes and last edits