finish screen fix, more splash screens
Merge remote-tracking branch 'origin/master'