Dries: Changes + megaman reimport