Updated meteor and misc logic tweaks