Starting up again, various small changes