Add comments and clean a bit some packages