Adding fixes for things, started merging scene changes into Ryan's new
files, changed the splash screen time to 1 sec and probably some other
things too.