Cleanup and text corrections