Some cleanup, but for the most part I can't find any more errors.