fixes and new edits