Cleanup + testing. Verified to be working and updating the info.