minor edits and working on main