Actually fix thanking and all that