latest meteor + minor changes