switching the splash and some more tweaks