Merged changes made while working on Ludum Dare.
Updated to Dart M3