Reverted preloading, fixed canvas stuff