feedzirra added, as well as some tweaks here and there