feedburner integration + some clean up