Improved splashscreen behavior
Clean ups and speed ups