Change text, fix a few things