changed appspot name, updated TODO