Added reload. More cleanup.