upgraded meteor, made some things cleaner