expand a bit - fix some errors