Converting to meteor. And other changes