updated migration references and merged all changes from master