Fixes and ending screen