upgraded meteor, removed code I will never use probably, removed repetitive code