Helped Nikhil fix some bugs