Update prompt, fix various things