Overall cleanup, missing splash right now...