fixed some pathing issues, splash still missing
Merge remote-tracking branch 'upstream/master'