Fixes up more imports, adds new excerpt field