Update meteor, misc changes