minor cleanup and ability to change camera name and info