Made requested changes/fixes from podio.