Fixed feed, other minor changes