Updated acknowledgments, added todos