merge
the rest of Davi's edits along with a few other minor edits