Fixes and a better excerpt