More fixes and splash