More Mario and fixes