Refactor simple_footer, small bug fixes/improvements.