text updates
fix conflict, and add for 500 too