More things, cleanup etc.