changed a few things around, added a couple more feeds