Fixed quantity editing, now polishing
editing mode works
merge conflict fixed