Simply changed some status codes and deleted TODO entries where tasks
were fullfilled