Added some changed, still more todo. Todo file out of date