Some basic improvements + canvas stuff