Updated a ton of stuff due to recent changes in Dart